From: Joakim Verona Date: Mon, 19 Aug 2013 15:26:39 +0000 (+0200) Subject: merge from trunk X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1db221681d0f80405475e9b5a018a7da2db770a5;p=emacs.git merge from trunk --- 1db221681d0f80405475e9b5a018a7da2db770a5